auto merge of #536 : superlogical/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 15:13:47 +0000 (15:13 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 15:13:47 +0000 (15:13 +0000)
commit50976aa23be4c9023d7eb980565253040b27d157
treeba24913b9d0d6a5b58324e35806f9d4ce33ef4af
parent444dc1e28e7cfc19500f8f98aa49e426ec9067fd
parentb9f5191e43c6c917e4f421683f4486e31dbff8b8
auto merge of #536 : superlogical/cargo/master, r=alexcrichton

So that it compiles and works